Revision: baz--bug4585--0--patch-12
Archive: rob.weir@canonical.com--2004-public
Creator: Rob Weir <rob.weir@canonical.com>
Date: Mon Jan 10 20:26:22 EST 2005
Standard-date: 2005-01-10 09:26:22 GMT
New-files: PLUGIN/.arch-ids/DIRS.id PLUGIN/.arch-ids/REQ.id
    PLUGIN/.arch-ids/auto.id PLUGIN/.arch-ids/options.id
    PLUGIN/DIRS PLUGIN/REQ PLUGIN/auto PLUGIN/options
    commands/cache-config.c commands/cache-config.h
    po/.arch-ids/ca.po.id po/.arch-ids/da.po.id
    po/.arch-ids/es_ES.po.id po/.arch-ids/fr_FR.po.id
    po/.arch-ids/nl.po.id po/.arch-ids/pt_BR.po.id
    po/.arch-ids/zh_CN.po.id po/ca.po po/da.po po/es_ES.po
    po/fr_FR.po po/nl.po po/pt_BR.po po/zh_CN.po
    tests/test-cache-config.sh
New-directories: .arch-ids
Removed-files: PLUGIN/DIRS PLUGIN/REQ PLUGIN/auto
    PLUGIN/options tests/test-archive-setup.sh
Renamed-files: commands/star-merge.c commands/merge.c
    commands/star-merge.h commands/merge.h
    libarch/star-merge.c libarch/merge.c
    libarch/star-merge.h libarch/merge.h
    tests/test-star-merge.sh tests/test-merge.sh
Modified-files: baz/baz.c commands/abrowse.c
    commands/ancestry.c commands/apply-changeset.c
    commands/archive-setup.c commands/branch.c
    commands/cachedrevs.c commands/cacherev.c
    commands/cmds.c commands/cmdutils.c commands/cmdutils.h
    commands/diff.c commands/diff.h commands/grab.c
    commands/import.c commands/join-branch.c commands/lint.c
    commands/make-branch.c commands/make-category.c
    commands/make-version.c commands/merge.c
    commands/merge.h commands/register-archive.c
    commands/resolved.c commands/status.c commands/switch.c
    commands/tests/unit-cmd-diff.c commands/tree-version.c
    commands/update.c libarch/ancestry.c libarch/ancestry.h
    libarch/arch-cache.c libarch/archive-mirror.c
    libarch/archive-pfs.c libarch/archive-pfs.h
    libarch/archive.c libarch/archive.h libarch/archives.c
    libarch/build-revision.c libarch/cached-archive.c
    libarch/cached-archive.h libarch/changeset-report.c
    libarch/changeset-utils.c libarch/commit.c
    libarch/import.c libarch/library-txn.c
    libarch/local-cache.c libarch/make-changeset.c
    libarch/merge-points.c libarch/merge-points.h
    libarch/merge.c libarch/merge.h libarch/my.c libarch/my.h
    libarch/patch-logs.c libarch/patch-logs.h
    libarch/pfs-dav.c libarch/pfs-dav.h
    libarch/pfs-signatures.c libarch/pfs.c libarch/pfs.h
    libarch/proj-tree-lint.c libarch/proj-tree-lint.h
    libarch/project-tree.c libarch/project-tree.h
    libarch/tag.c libawk/associative.c libawk/associative.h
    libawk/relational.h po/cy.po po/es.po po/etc/messages.pot
    tests/Makefile.in
    tests/jane-and-foo-do-hello-world-1-baz.sh
    tests/jane-and-foo-do-hello-world-1.sh
    tests/jane-and-foo-do-hello-world-2.sh
    tests/test-archive-registration.sh tests/test-commit.sh
    tests/test-framework tests/test-import-baz.sh
    tests/test-import.sh tests/test-merge.sh
    tests/test-mirror.sh tests/test-status.sh
    tests/test-tag-baz.sh tests/test-tag.sh
    {arch}/=tagging-method
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-6
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-7
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-8
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-9
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-10
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-11
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-12
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-13
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-14
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-15
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-16
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-17
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-18
    aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-19
    jblack@gnuarch.org--2004/baz--check-proj-tree-version--1.1--base-0
    jblack@gnuarch.org--2004/baz--check-proj-tree-version--1.1--patch-1
    jblack@gnuarch.org--2004/baz--copyright--1.1--base-0
    jblack@gnuarch.org--2004/baz--copyright--1.1--patch-1
    jblack@gnuarch.org--2004/baz--deltawadddiff--1.1--base-0
    jblack@gnuarch.org--2004/baz--deltawadddiff--1.1--patch-1
    jblack@gnuarch.org--2004/baz--lesscommands--1.1--base-0
    jblack@gnuarch.org--2004/baz--mirror-namelessbranch--1.1--base-0
    jblack@gnuarch.org--2004/baz--mirror-namelessbranch--1.1--patch-1
    jblack@gnuarch.org--2004/baz--mirror-namelessbranch--1.1--patch-2
    jblack@gnuarch.org--2004/baz--nonracy-changes--1.1--base-0
    jblack@gnuarch.org--2004/baz--nonracy-changes--1.1--patch-1
    jblack@gnuarch.org--2004/baz--register-archive--1.1--base-0
    jblack@gnuarch.org--2004/baz--register-archive--1.1--patch-1
    jblack@gnuarch.org--2004/baz--status--1.1--base-0
    jblack@gnuarch.org--2004/baz--status--1.1--patch-1
    jblack@gnuarch.org--2004/baz--status--1.1--patch-2
    jblack@gnuarch.org--2004/baz--status--1.1--patch-3
    jblack@gnuarch.org--2004/baz--status--1.1--patch-4
    jblack@gnuarch.org--2004/baz--switch--1.1--base-0
    jblack@gnuarch.org--2004/baz--switch--1.1--patch-1
    jblack@gnuarch.org--2004/baz--switch--1.1--patch-2
    jblack@gnuarch.org--2004/baz--switch-defaultarchive--1.1--base-0
    jblack@gnuarch.org--2004/baz--switch-defaultarchive--1.1--patch-1
    jblack@gnuarch.org--2004/baz--tolint--1.1--base-0
    jblack@gnuarch.org--2004/baz--tolint--1.1--patch-1
    jblack@gnuarch.org--2004/baz--tolint--1.1--patch-2
    jblack@gnuarch.org--2004/baz--tolint--1.1--patch-3
    jblack@gnuarch.org--2004/baz--treeversionhelp--1.1--base-0
    jblack@gnuarch.org--2004/baz--treeversionhelp--1.1--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4585--0--patch-12
    rob.weir@canonical.com--2004-public/baz--bug4697--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4697--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4702--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4729--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-3
    rob.weir@canonical.com--2004-public/baz--bug4731--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4731--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4731--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
    rob.weir@canonical.com--2004-public/baz--bug5187--0--base-0
    rob.weir@canonical.com--2004-public/baz--bug5187--0--patch-1
    rob.weir@canonical.com--2004-public/baz--bug5187--0--patch-2
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-49
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-50
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-51
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-53
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-54
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-55
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-57
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-58
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-59
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-4
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-5
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-6
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-7
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-8
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-10
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-11
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-12
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-13
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-14
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-15
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-16
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-17
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-18
    robert.collins@canonical.com--general/bazaar--merge--1.1--patch-19
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--base-0
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-1
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-2
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-3
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-4
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-5
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-6
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-7
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-8
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-9
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-10
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-11
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-12
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-13
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-14
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-15
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-16
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-17
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-18
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-19
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-20
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-21
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-22
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-23
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-24
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-25
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-26
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-27
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-28
    robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-29
    robert.collins@canonical.com/bazaar--experimental--1.1--base-0
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--base-0
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-1
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-2
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-3
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-4
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-5
    robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-6
    thelove@canonical.com/bazaar--devo--1.1--patch-62
    thelove@canonical.com/bazaar--devo--1.1--patch-63
    thelove@canonical.com/bazaar--devo--1.1--patch-64
    thelove@canonical.com/bazaar--devo--1.1--patch-65
    thelove@canonical.com/bazaar--devo--1.1--patch-66
    thelove@canonical.com/bazaar--devo--1.1--patch-67
    thelove@canonical.com/bazaar--devo--1.1--patch-68
    thelove@canonical.com/bazaar--devo--1.1--patch-69
    thelove@canonical.com/bazaar--devo--1.1--patch-70
    thelove@canonical.com/bazaar--devo--1.1--patch-71
    thelove@canonical.com/bazaar--devo--1.1--patch-72
    thelove@canonical.com/bazaar--devo--1.1--patch-73
    thelove@canonical.com/bazaar--devo--1.1--patch-74
    thelove@canonical.com/bazaar--devo--1.1--patch-75
    thelove@canonical.com/bazaar--devo--1.1--patch-76
    thelove@canonical.com/bazaar--devo--1.1--patch-77
    thelove@canonical.com/bazaar--devo--1.1--patch-78
    thelove@canonical.com/bazaar--devo--1.1--patch-79
    thelove@canonical.com/bazaar--devo--1.1--patch-80
    thelove@canonical.com/bazaar--devo--1.1--patch-81
    thelove@canonical.com/bazaar--devo--1.1--patch-82
    thelove@canonical.com/bazaar--devo--1.1--patch-83
    thelove@canonical.com/bazaar--devo--1.1--patch-84
    thelove@canonical.com/bazaar--devo--1.1--patch-85
    thelove@canonical.com/bazaar--devo--1.1--patch-86
    thelove@canonical.com/bazaar--devo--1.1--patch-87
    thelove@canonical.com/bazaar--devo--1.1--patch-88
    thelove@canonical.com/bazaar--devo--1.1--patch-89
    thelove@canonical.com/bazaar--devo--1.1--patch-90
    thelove@canonical.com/bazaar--devo--1.1--patch-91
    thelove@canonical.com/bazaar--devo--1.1--patch-92
    thelove@canonical.com/bazaar--devo--1.1--patch-93
    thelove@canonical.com/bazaar--devo--1.1--patch-94
    thelove@canonical.com/bazaar--devo--1.1--patch-95
    thelove@canonical.com/bazaar--devo--1.1--patch-96
    thelove@canonical.com/bazaar--devo--1.1--patch-97
Summary: Sync up with THELOVE.
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-5
   Merge from thelove

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-6
   Fixed memory allocation error

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-7
   Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-8
   Made non-filesystem locations cached by default, adding uncached:

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-9
   Factored out, the uncached-location code, used it for making locations

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-10
   Automatically enabled the cache, if no =arch-cache file exists

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-11
   Caused my_cache_path to return NULL for empty =arch-cache files

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-12
   Style fix

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-13
   made cache functions callable when cache is inactive (but do nothing)

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-14
   Fixed set_my_cache_path when file already exists

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-15
   Added cache-config command

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-16
   Added id for cache-config.h

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-17
   Added unit tests for cache-config

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-18
   Changed untagged-source disposition

 * aaron.bentley@utoronto.ca--baz/bazaar--cached--1--patch-19
   Merge from pqm

 * jblack@gnuarch.org--2004/baz--check-proj-tree-version--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-85

 * jblack@gnuarch.org--2004/baz--check-proj-tree-version--1.1--patch-1
   Make sure that we can handle this version of the working copy

 * jblack@gnuarch.org--2004/baz--copyright--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-73

 * jblack@gnuarch.org--2004/baz--copyright--1.1--patch-1
   Fix up copyright line for regexps.com

 * jblack@gnuarch.org--2004/baz--deltawadddiff--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-92

 * jblack@gnuarch.org--2004/baz--deltawadddiff--1.1--patch-1
   baz delta --diffs now shows diffs for added bugs (fixes 3397)

 * jblack@gnuarch.org--2004/baz--lesscommands--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-71

 * jblack@gnuarch.org--2004/baz--mirror-namelessbranch--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-84

 * jblack@gnuarch.org--2004/baz--mirror-namelessbranch--1.1--patch-1
   Fix archive mirror when given nameless branch

 * jblack@gnuarch.org--2004/baz--mirror-namelessbranch--1.1--patch-2
   First fix wasn't quite right. Tests say it is now

 * jblack@gnuarch.org--2004/baz--nonracy-changes--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-91

 * jblack@gnuarch.org--2004/baz--nonracy-changes--1.1--patch-1
   baz status no longer racy (fixes #3394 and heads off a couple small unreported bugs)

 * jblack@gnuarch.org--2004/baz--register-archive--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-74

 * jblack@gnuarch.org--2004/baz--register-archive--1.1--patch-1
   Detect invalid archive names during registration

 * jblack@gnuarch.org--2004/baz--status--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-58

 * jblack@gnuarch.org--2004/baz--status--1.1--patch-1
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-86

 * jblack@gnuarch.org--2004/baz--status--1.1--patch-2
   don't check for reject state if we were told to not lint

 * jblack@gnuarch.org--2004/baz--status--1.1--patch-3
   now hide rejects/inventory in status if a category is specified

 * jblack@gnuarch.org--2004/baz--status--1.1--patch-4
   finishing up ddaa's request.

 * jblack@gnuarch.org--2004/baz--switch--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-86

 * jblack@gnuarch.org--2004/baz--switch--1.1--patch-1
   Check earlier in switch for a reject state

 * jblack@gnuarch.org--2004/baz--switch--1.1--patch-2
   Updating switch help to be more clear of what it does

 * jblack@gnuarch.org--2004/baz--switch-defaultarchive--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-83

 * jblack@gnuarch.org--2004/baz--switch-defaultarchive--1.1--patch-1
   Fixed up switch so that it shouldn't need a default archive

 * jblack@gnuarch.org--2004/baz--tolint--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-72

 * jblack@gnuarch.org--2004/baz--tolint--1.1--patch-1
   Removed make-(branch|category|version) and archive-setup, fixed import to not be dependant upon them

 * jblack@gnuarch.org--2004/baz--tolint--1.1--patch-2
   Adding a include for archive-setup

 * jblack@gnuarch.org--2004/baz--tolint--1.1--patch-3
   Fixed the tests for the command removal

 * jblack@gnuarch.org--2004/baz--treeversionhelp--1.1--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-69

 * jblack@gnuarch.org--2004/baz--treeversionhelp--1.1--patch-1
   Fixing up help for tree-version

 * rob.weir@canonical.com--2004-public/baz--bug4697--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-74

 * rob.weir@canonical.com--2004-public/baz--bug4697--0--patch-1
   Note that 'resolved' can't handle filenames yet, fixing #4697.

 * rob.weir@canonical.com--2004-public/baz--bug4702--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-74

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-62

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-1
   Add -d option to branch which shifts directory before doing stuff.

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-2
   Make . the default directory.

 * rob.weir@canonical.com--2004-public/baz--bug4729--0--patch-3
   Use tla in the tests, since it's a shell wrapper for the current baz.

 * rob.weir@canonical.com--2004-public/baz--bug4731--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-63

 * rob.weir@canonical.com--2004-public/baz--bug4731--0--patch-1
   Alter help to show what each status character means.

 * rob.weir@canonical.com--2004-public/baz--bug4731--0--patch-2
   Expand help note.

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-63

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-1
   Apply patch from James Hentridge to use size_t instead of int.

 * rob.weir@canonical.com--2004-public/baz--bug4889--0--patch-2
   Sync up with THELOVE.

 * rob.weir@canonical.com--2004-public/baz--bug5187--0--base-0
   tag of thelove@canonical.com/bazaar--devo--1.1--patch-89

 * rob.weir@canonical.com--2004-public/baz--bug5187--0--patch-1
   Add trailing newline to 'Invalid archive name' error message.

 * rob.weir@canonical.com--2004-public/baz--bug5187--0--patch-2
   Add trailing newlines to 'cannot commit to sealed version' error messages.

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-48
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-49
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-50
   fix up the es_ES template

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-51
   update messages.pot, and fix typo in apply-changeset.c

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-52
   merge from rf

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-53
   rename libarch/star-merge to libarch/merge

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-54
   fix tree_version leak in merge

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-55
   fix leak in i18n setup

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-56
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-57
   remove lint chatter that interferes with piping

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-58
   refactor the inventory linting and status generation to allow separate invocation, use this to allow status to lint before doing changes, but to still show the lint output after the changes. Fixes: bug #4581

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-59
   use a default uid for archive transactions when required. uids are not unique to instances of baz, so this is safe. fixes: #3220

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-4
   first cut graph merge operator in star-merge. leaky, but optimiseable

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-5
   remove unneeded join-branches

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-6
   implement basic trace functionality for merge.

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-7
   change smart merge algorithm to generate minimum depth intersection of patch logs

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-8
   teach merge to really use one of the best merge parents

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-9
   rename star-merge to merge

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-10
   remove a non needed helper function

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-11
   code cleanups for star-merge.c

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-12
   begin per-tree patch looks for uncommitted merges, and fix handling trimed patches

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-13
   merge from thelove@canonical.com/bazaar--devel--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-14
   merge from the current state of the 'this' tree, not the last committed state

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-15
   merge from robert.collins@canonical.com/bazaar--devel--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-16
   fix memory leak in merge and reduce the number of warnings given. Fixes: #4756

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-17
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-18
   merge from thelove@canonical.com/bazaa--devo--1.1

 * robert.collins@canonical.com--general/bazaar--merge--1.1--patch-19
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--base-0
   tag of robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-6

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-1
   rough cut at patch_ancestry auto generation

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-2
   create {arch}/+ancestry automatically

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-3
   scan the archive if the +ancestry file does not document the needed revision

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-4
   set PARTIAL on ancestry when needed

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-5
   unbreak the ancestry commands other uses

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-6
   actually get all of the available revisions.. there was an off by one error before

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-7
   the ancestry UI should not access each archive unless headers are being displayed

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-8
   handle complete ancestry correctly

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-9
   use +ancestry files from revision libraries if available

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-10
   massive simplification of ancestry_scan

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-11
   implement maximum depth searches for ancestry, and a connection cache

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-12
   move project tree methods from ancestry.c to project_tree.c

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-13
   centralise the ancestry file hardcoded strings

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-14
   add auto upload of ancestry.gz to commit

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-15
   teach archive-mirror about ancestry

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-16
   teach import about ancestry

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-17
   missed a baz literal when stripping out the common text

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-18
   teach baz branch about ancestry files

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-19
   merge from thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-20
   teach arch_patch_ancestor to retrieve ancestry.gz files

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-21
   fixup issues with using unavailable history - soft_errors supportin archives

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-22
   convert libarch calls to arch_ancestor_revision to arch_patch_ancestor

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-23
   test-framework compare_trees_simple needs to ignore + files too

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-24
   snap ancestry during getting of reference trees

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-25
   rename the ancestry checksum file to be more friendly to browsers

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-26
   factor out checking for cached ancestry data to allow easier integration into the cached-archive framewrk

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-27
   snarf history during commits

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-28
   bwah, default to full history for now

 * robert.collins@canonical.com--general/bazaar--tree-ancestry--1.1--patch-29
   make the arch_patch_ancestor api closer to arch_ancestor_revision

 * robert.collins@canonical.com/bazaar--experimental--1.1--base-0
   tag of robert.collins@canonical.com--general/bazaar--devo--1.0--patch-28

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--base-0
   tag of robert.collins@canonical.com/bazaar--experimental--1.1--base-0

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-1
   start factoring out ancestry calculations

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-2
   implement soft_errors through to the webdav level

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-3
   create ancestry files from baz ancestry

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-4
   merge up to the latest thelove@canonical.com/bazaar--devo--1.1

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-5
   start writing patch_ancestry as a libarch function

 * robert.collins@canonical.com/bazaar--tree-ancestry--1.1--patch-6
   read in {arch}/+ancestry if it exists

 * thelove@canonical.com/bazaar--devo--1.1--patch-62
   new merge algorithm that deals with tags and cycles more sanely that star-merge

 * thelove@canonical.com/bazaar--devo--1.1--patch-63
   Merge in latest translations : Catalan, Chinese, Danish, Dutch, Frence, Portuguese, Spanish

 * thelove@canonical.com/bazaar--devo--1.1--patch-64
   Fixed error in memory allocation for cached archives

 * thelove@canonical.com/bazaar--devo--1.1--patch-65
   Fixed error in memory allocation for cached archives (for real)

 * thelove@canonical.com/bazaar--devo--1.1--patch-66
   Use size_t instead of int in one case, to fix a build failure on amd64 (#4889).

 * thelove@canonical.com/bazaar--devo--1.1--patch-67
   Use size_t instead of int, fixing a build failure on amd64 (thanks James Henstridge, #4889).  Archive-mirror'ing this time.

 * thelove@canonical.com/bazaar--devo--1.1--patch-68
   tweak lints output for adhoc scripting

 * thelove@canonical.com/bazaar--devo--1.1--patch-69
   refactor the inventory linting and status generation to allow separate invocation, use this to allow status to lint before doing changes, but to still show the lint output after the changes. Fixes: bug #4581

 * thelove@canonical.com/bazaar--devo--1.1--patch-70
   updating tree-version help to be inline with actual usage (new version instead of dir)

 * thelove@canonical.com/bazaar--devo--1.1--patch-71
   use a default uid for archive transactions when required. uids are not unique to instances of baz, so this is safe. fixes: #3220

 * thelove@canonical.com/bazaar--devo--1.1--patch-72
   Removed 4 commands (archive-setup|make-(category|branch|version)

 * thelove@canonical.com/bazaar--devo--1.1--patch-73
   Fixed several commands to send user to status --lint instead of tree-lint

 * thelove@canonical.com/bazaar--devo--1.1--patch-74
   fix memory leak in merge and reduce the number of warnings given. Fixes: #4756

 * thelove@canonical.com/bazaar--devo--1.1--patch-75
   Add description of the symbols in the output of 'status', fixes: #4731.

 * thelove@canonical.com/bazaar--devo--1.1--patch-76
   (This is the actual code for updating tree-lint help and removing several make-(branch|category|version) archive-setup commands

 * thelove@canonical.com/bazaar--devo--1.1--patch-77
   Fixed up the copyright with baz --version

 * thelove@canonical.com/bazaar--devo--1.1--patch-78
   Note that 'resolved' can't handle filenames yet, fixing #4697.

 * thelove@canonical.com/bazaar--devo--1.1--patch-79
   (This is the actual code for updating tree-lint help and removing several make-(branch|category|version) archive-setup commands

 * thelove@canonical.com/bazaar--devo--1.1--patch-80
   Give more sensible errors when 'switch' gets the wrong number of arguments, fixes: #4702.

 * thelove@canonical.com/bazaar--devo--1.1--patch-81
   Give 'branch' a -d option, fixes #4729.

 * thelove@canonical.com/bazaar--devo--1.1--patch-82
   minor merge improvements to make the UI cleaner

 * thelove@canonical.com/bazaar--devo--1.1--patch-83
   Baz now only allows registration of an archive if the name is 'right' (w/ new test cases)

 * thelove@canonical.com/bazaar--devo--1.1--patch-84
   baz switch shouldn't need a default archive any more

 * thelove@canonical.com/bazaar--devo--1.1--patch-85
   archive-mirror no longer mirrors all branches when given no branches (fixes 3576)

 * thelove@canonical.com/bazaar--devo--1.1--patch-86
   Make sure we can handle this working tree version (fixes #5250, spawns #5270)

 * thelove@canonical.com/bazaar--devo--1.1--patch-87
   Two fixes: switch checks for rejects sooner, and help is updated to be more clear on what switch does

 * thelove@canonical.com/bazaar--devo--1.1--patch-88
   In status, don't check for reject state if --no-lint is set (fixes 4703)

 * thelove@canonical.com/bazaar--devo--1.1--patch-89
   Finishing up fix for 4703 (status only linting if a filter is given) (fixes 4703)

 * thelove@canonical.com/bazaar--devo--1.1--patch-90
   Add trailing newlines to some error messages, fixes #5187.

 * thelove@canonical.com/bazaar--devo--1.1--patch-91
   Added default caching, cache-config command

 * thelove@canonical.com/bazaar--devo--1.1--patch-92
   Baz status no longer racy (fixes #3394)

 * thelove@canonical.com/bazaar--devo--1.1--patch-93
   baz delta --diffs now shows diffsfor added bugs (fixes 3397)

 * thelove@canonical.com/bazaar--devo--1.1--patch-94
   integrate in patch_ancestry as a new API, closes: #5190

 * thelove@canonical.com/bazaar--devo--1.1--patch-95
   empty commit to create an ancestry file for bazaar

 * thelove@canonical.com/bazaar--devo--1.1--patch-96
   really do an empty commit to create an ancestry file for bazaar

 * thelove@canonical.com/bazaar--devo--1.1--patch-97
   bugfix for patch_ancestry

